DO NOT MERGE - Merge RP1A.201005.006

Bug: 168212094
Merged-In: I4c98b705f91eb47469d02f5c1a5fa1ad57581865
Change-Id: Ibb71a3d8538dd1b74a3e6c8eaaabbe02ca7b18cf