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

Bug: 120848293
Change-Id: If958eb7b788b1212c51b1720b196ae4b253e1d15