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

Bug: 120848293
Change-Id: I9a3370b92a41d70bc0bac7c6ed884319472db3f4