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

Change-Id: Ia25b02f0df97306066a4f52687ab55376b8bc3bb