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

Change-Id: I2c0d2fafad267c44f2b18172aab737e504e4086c