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

Change-Id: Ibf0513d920750c9536aef1b71841bf2386be0de6