[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
am: 0768e6b58e -s ours
am skip reason: subject contains skip directive

Change-Id: Iec5d34bb32d8e34389c77c474e8cfb2faa20b721