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

Change-Id: I460c9e3b2c323fda72a045b286b24060832a2365