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

Change-Id: I31b7394a66d3121601177cae6ce5ee72a11e633e