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

Bug: 120848293
Change-Id: If6e644f4833aae51c1216318ea772592cf6b4526