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

Change-Id: I0ad82acf572df5ba94d7895e85688e867288d101