[automerger skipped] Merge "DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master" into stage-aosp-master am: fc53be7b56 -s ours
am: e01bd73441 -s ours
am skip reason: subject contains skip directive

Change-Id: I74345f6fe80643fae680d46fd27d9c1b285e600f