Revert "Bug fixing for AOSP refresh."

This reverts commit cb5fc31693e9822e8c1f57c55db4276c82833442.

Change-Id: Ic380f88784ad3f70b74b48d0baefca56353440c7
1 file changed