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

Bug: 120848293
Change-Id: I074e0d954e8c5e8a81b15d3ac67701359844e7a3