Merge cherrypicks of [3502352, 3501378, 3502262, 3503730, 3502234] into pi-release

Change-Id: Ia994599d0064d0aec8edea4aca81ded97a16d484