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

Bug: 120848293
Change-Id: Ie032cdb7e7e1bcb8ad3d9c6e0893c7f626796606