Merge cherrypicks of [2278225, 2279882, 2279862, 2278226, 2277057, 2279863, 2278227] into nyc-mr2-pixel-monthly-release

Change-Id: I6774ef85615b095adca014cd9a8dbf126aea7f4c