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