DO NOT MERGE - Merge RP1A.201005.006

Bug: 168212094
Change-Id: I3a2f33ac2dfa7f42b380d3083abdc3f7f61c834d