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

Bug: 120848293
Change-Id: If5e8c52fcf82a5fb0aaa38cf23be63409482b8d3