Merge cherrypicks of [3535875, 3534641, 3534642, 3536651, 3536652, 3536653, 3535904, 3535498, 3536654, 3535876, 3534643, 3535905] into pi-release

Change-Id: Ie533a45f6fbde549a5c99e8be5400381a51b82ac