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