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

Bug: 120848293
Change-Id: I8bf6f948a13e3d3540bcb6db87e225c63104a53e