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

Bug: 120848293
Change-Id: If5b3848ea1002c2fcce994e2e8056d93f8539283