Merge cherrypicks of [
2607234,
2607235,
2606313,
2607236,
2607238,
2607239,
2606314,
2606315,
2607240,
2606316,
2606317,
2607241,
2607242,
2607243,
2607244,
2607370,
2607371,
2607245,
2607246,
2607247,
2607248,
2607249,
2607372,
2607390,
2607391,
2607392,
2607393,
2607373,
2607394,
2607397,
2607398,
2607375,
2607401,
2607376,
2607402,
2607377,
2607403,
2607404,
2607378,
2607405,
2607379,
2607380,
2607381,
2607406,
2607382,
2607407,
2607408,
2607409] into nyc-mr2-release
Change-Id: Icc26e4fc1c963ded7996ec0ce416643c1ff3d759