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

Change-Id: I2cb2b56871fac6f8348289aad231dae4e52c3186