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

Change-Id: I11497a555ad1772e3b990343b7b72d91abb0b2da