DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master Bug: 120848293 Change-Id: Iad79a993af2d9ffa3ad6ab7a014f2a182d32fff0