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

Bug: 120848293
Change-Id: If9d46ccb84262fb89c797fa5cfb6b4579127c4e9