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