Merge cherrypicks of [1275204, 1275205, 1275374, 1275523, 1275524, 1275525, 1275526, 1275527, 1275528, 1275529, 1275530, 1275531, 1275572, 1275573, 1275574, 1275396, 1275397, 1275217, 1275533, 1275534, 1275535, 1275536, 1275434] into sparse-6113669-L70900000513942386

Change-Id: I49377b0389920ece280746575e5bd03e506c78db