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

Bug: 120848293
Change-Id: I3e647c28f1d233c3be941959806acb24d1e816b8