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

Change-Id: I7dd2d8e81297d5911f973b3e3a65a50203f30a23