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

Bug: 120848293
Change-Id: I0f7f35fdf688411a57bbd1d096212946aabbdcbc