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

Bug: 120848293
Change-Id: Ie9a85fba2a7104182c5396751e85f44afdcd378e