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

Bug: 120848293
Change-Id: I809f64bd5936835bae3618c479419e19ebcf0c07