DO NOT MERGE - Merge RP1A.201005.006

Bug: 168212094
Merged-In: I1f62fdc077401fea2c48a31527464464f08a6b64
Change-Id: I1aee1644b811fc9de2b82b99100e3f43be4daf44