f920f821e2
Bug: http://b/20065774 This reverts commit dffd3c58389103d6ee712fac6544217c00c1f315. Change-Id: I5dd095ff4ab133baa2afcbd4c79fbee55d05c459