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

Change-Id: I3ed54eb35718864cf5d6082bf7a0685f11bea14e