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

Bug: 120848293
Change-Id: I0e65776e64f451cd1778a5e02b578a77acae33c5