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

Bug: 120848293
Change-Id: I62b3f8e3151b352b3eb6d271958a718f16658879