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

Bug: 120848293
Change-Id: I22e5c84c3d8061a6f6dda2180d219a35532b2cf9