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