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

Bug: 120848293
Change-Id: I7fbc3ccde5303a96c8259a5fed9dbf55de2f350a