Merge cherrypicks of [4647037, 4647038, 4647883, 4647039, 4647933, 4648530,...

Merge cherrypicks of [4647037, 4647038, 4647883, 4647039, 4647933, 4648530, 4648550, 4648551, 4648552, 4648553, 4646931, 4646932, 4646933, 4646934, 4648391, 4647976, 4647977, 4647978, 4647526, 4646972, 4646935, 4646936, 4646937, 4646938, 4646939, 4646940, 4646941, 4648392, 4647509, 4648630, 4648631, 4647934] into pi-release-2
am: cbaaaff2

Change-Id: Iccf4d47f0815697d25c3c7e2152f64429f59feaa