DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master

Bug: 120848293
Change-Id: Ia7ff0d02ab5c95c93cf1a4a1438863757dfcab64