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

Change-Id: I346985494a9a2d2af073421523a323b2ea71ddc1