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

Change-Id: Id543aa43701e3a5e2a16922ff08867aa0131aea7