Merge cherrypicks of [3464897, 3465870, 3464898] into pi-release

Change-Id: Ib6892d147181e392a94d69a3fa9d89a151147544