[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master am: 4b9339e40c -s ours am skip reason: subject contains skip directive Change-Id: I917dabde2cf0c049c183ddec7bd47d4bc8e6b54e