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