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

Bug: 120848293
Change-Id: Iee545435c0cbdc9dc3b0c9bfb985127f79190ea4