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

Bug: 120848293
Change-Id: I7ce8a298ccae4d818f635fee491ecea60de46708