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

Change-Id: Ic098cb32515f7ba91d30163f476c8afa560bd257