DO NOT MERGE - Merge RP1A.201005.006

Bug: 168212094
Change-Id: I926f2620c5d5b6cae7863e027c5bc57bed197be9