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

Bug: 120848293
Change-Id: Icca02c63570a8e646c224be5005d45780d98dbd8