Merge cherrypicks of [3690002, 3691519, 3691668, 3690254, 3691428, 3690156] into pi-release

Change-Id: I250c91b3e8eaf9abed407bd6dca5603938994a3d