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

Change-Id: I4de72eeb16c5a566f55143b390044ad117fac2cb