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

Bug: 120848293
Change-Id: I6e0d221bf558675cb9886c6abea85c8ddf249ec7