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