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

Change-Id: Ie154c7611aaeb814d57d3c5a603452dd5585b907