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

Change-Id: I62926f0bae93f905132caacfe7b2c41054a443c8