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

Change-Id: I050e953c1f9428a616da29da139c67915df7a900