Merge cherrypicks of [1163201, 1162984, 1163202, 1163203, 1163185, 1163186, 1163187] into sparse-5991721-L86000000387707031

Change-Id: Id7b1616ce641e5fab33d0582c9197f0b0ddef645