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

Change-Id: Ibb3ebd4d2c1ff57eae9921a4b47bc409e9f739e5