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

Bug: 120848293
Change-Id: I4722726f8cbb9b828869f8c45e48148eab649e9b