Merge cherrypicks of [3026768, 3026929, 3026930, 3026931, 3026932, 3026933, 3026934, 3026935, 3026936, 3026937, 3026938, 3026939, 3026734] into nyc-mr2-release

Change-Id: I2059608bfea23e1f8b2e3de4a19e1884d9fde8f2