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

Change-Id: I6d4ef1aa613e168726256d2745498f705c94ee42