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

Change-Id: I1a51709990b5742e90c55bdb7db5c82ed2a67180