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

Change-Id: Id09514eaecff09464485d6b03f95070688215428