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

Change-Id: I63cfb26e274bffd8e39ca9f3160e89a526f199ec