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