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

Change-Id: I9db842c147d152f9969a0c3dfc437152f0b65319