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

Change-Id: I9212bcf8e6595b63fc8d8754235d578df7dfca6c