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

Bug: 120848293
Change-Id: I04034b72102bcb6f01062bba62843f92ac7aee37