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

Bug: 120848293
Change-Id: I615c32fde92246783a8a218878bfa48ba02948c0