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

Bug: 120848293
Change-Id: I5fc99cf5e846bed8b258cf516ebb1e21c9c48c3b