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

Change-Id: I3dc763f3e74642a5f9677047fbf5096fec8a352f