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