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

Bug: 120848293
Change-Id: I6623af5888f04adc3c220472870cd7c0534c0d6f