We don't need this any more. Bug: 10211309 (cherry picked from commit 437e76208d451e7954699ead8931d0fe147bb07d) Change-Id: I97b3ab4f65a70eacca2fbe95cfb11b1cc85c4021