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

Change-Id: Ia663aec1b161470250abfd6b3dc9b7600adbbc1c