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

Change-Id: Ic02ee51e4fe9dfe34ad4440da057bd258b6397d1