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