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

Bug: 120848293
Change-Id: I99f9bb2968410e111b83f3f1428054d32d1914e5