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

Change-Id: Ibb47ce384b13579014dcd4830ec5f9d2db7c8179