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

Bug: 120848293
Change-Id: I825cb76e41707a38ef3502494e138b5b345553f0