DO NOT MERGE - Merge RP1A.201005.006 Bug: 168212094 Change-Id: I476bb12be2a41b5891370975cbeafd07baec19e6