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

Bug: 120848293
Change-Id: Icc60878209e3b89a944cc4a7b228025d49e31ada