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

Bug: 120848293
Change-Id: I4fea88387af1efa56dc29c688041ecc782b49f19