Merge cherrypicks of [3026790, 3026791, 3026792, 3026793, 3026909, 3026812, 3026949] into nyc-bugfix-release

Change-Id: I96c101df42781168a58bd13bfd0b1a58f96b7a28