Merge upstream-pi-dev to pi-dev.

Bug: 111935745
Change-Id: Ifbe20a2595862cbd0bce8596154ee3ca5419e006