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

Change-Id: I3d4582885b96c96308856ff969fce86a2b51edc3