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