Bug: 17675571 - All of the mistakes were made. Unmake them. Change-Id: I23ff7a553347d4d9588c728219f4bf0604ba2e38