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

Change-Id: I817b2eeeddf9d9eaccf3a9508a7209184a65272f