DO NOT MERGE - Merge RP1A.201005.006

Bug: 168212094
Merged-In: Ieea6a708ca0fd1689e4b120db12f0cd96e8db95d
Change-Id: Ia1e496602eaa75f3fbe70cb94a7af23bc48ace17