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