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

Bug: 120848293
Change-Id: I8ff52d50c5769b6d22f72bb9b60e6de6683f33f4