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

Change-Id: Id6e98cda754597cd5011a9a539f651e998206d18