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