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

Bug: 120848293
Change-Id: I6eeee632ff6ee7f2d7395344a7887c44c7acd440