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

Bug: 120848293
Change-Id: Ibaa2b4e90e2e6d37d7a21ee8f74689ce2fe4cc80