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

Bug: 120848293
Change-Id: Ife9df84d9852399a6b10e9dbcb6907d73b8ab5eb