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

Change-Id: Id216f783d87a691326f682bfe14e8889cb2c07c7