Merge cherrypicks of [3646665, 3646666, 3647015, 3647016, 3647283, 3647284, 3647285, 3646882, 3647094, 3647095, 3647096, 3647097, 3647098, 3647099, 3647100, 3647101, 3647102, 3647286, 3647287] into nyc-bugfix-release

Change-Id: I110f9b806d54e5105ee00bafdbe34060f598e83f