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

Bug: 120848293
Change-Id: I1381e2ad60ed979c49366d7c70e80c552f783188