Merge cherrypicks of [2969924, 2969794, 2969773, 2970233, 2969774, 2969730, 2969731, 2969795, 2969796, 2969797, 2969798, 2969799, 2970191, 2970192, 2970193, 2970194, 2970195, 2970196, 2970197, 2969421, 2969422, 2969423, 2969496, 2969900, 2969564] into nyc-bugfix-release

Change-Id: Id4db34c80fbf2a490dfd4e472a9281e6e8ed256f