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