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