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

Bug: 120848293
Change-Id: I6a4db2f974f6aa23afb63c8d1a498ce7b655a2e2