DO NOT MERGE - Merge RP1A.201005.006

Bug: 168212094
Merged-In: Idef112187f34a18feea7e6a0b77258626f9d0ed4
Change-Id: Ibab48c1925a0ab7a80ddcaba45a7b73219bb0b0a