DO NOT MERGE - Merge RP1A.201005.006

Bug: 168212094
Change-Id: Ie22f5adbbf949daa0d82b510a010780eaa76918b