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

Bug: 120848293
Change-Id: I1532a834c49fac1db11a2d0a72b9bb6e33df9b4e