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