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

Change-Id: I913da63350b14c1b89a95c2d1f0c866ebbd474b0