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