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

Change-Id: Ie336dd7c56146070ca0ff791ec10c23d412fdadb