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