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