Merge "Merge cherrypicks of [1698886, 1699025, 1699027] into sparse-7283794-L72900000880882052" into sparse-7283794-L72900000880882052