Merge cherrypicks of [10880181, 10883346, 10883347, 10883348, 10883349, 10883812, 10883813, 10883716, 10883814, 10883815, 10883672, 10876113, 10883717, 10883359, 10883882] into sparse-6310743-L56900000511645444

Change-Id: I6e26c02d1982c1c8dfc52ec3602b444c22c06f1a