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

Change-Id: If98f33d470636700e6c60718115b075d1e5d01c9