Merge cherrypicks of [2892168, 2892830, 2892833, 2892799, 2892800, 2892658, 2892659, 2892512, 2892869, 2892870, 2892871, 2892872, 2892873, 2892874, 2892875, 2892513, 2892514, 2892876, 2892816, 2892817, 2892923, 2892422] into nyc-mr1-volantis-release

Change-Id: I335f69568edd05286b581b8c16f96f81df8d2121