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

Bug: 120848293
Change-Id: Ib1b05ba3eef633f4aba9c8859e9979cc6e338bdb