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

Change-Id: I7789ffcd9ea66440cd888d04fcfed5281af84a34