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