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

Change-Id: I75b9964a6391fca1627628c72fe78c5ad3684e7e