Merge cherrypicks of [4263232, 4263453, 4262483] into pi-release

Change-Id: I911e9e881a4345f9ecd2fa133076a6ef38578f8e