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

Bug: 120848293
Change-Id: I508c6f48aa4ffb22aba3fcb583b8fd3f51b25b33