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

Change-Id: I22ab951a4f105f09e40c39e4028a237870fe22c2