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

Change-Id: I4ce684d9825b6e770f8bfbdb6b20f56ad809756a