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

Bug: 120848293
Change-Id: I2c540b3cb5eb5ad7ebf665cd7b00041037806122