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