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

Change-Id: Ie86491abd3267d057b655ae611dfd26f5fcfeea9