Merge cherrypicks of [9462395, 9462396, 9462397, 9462969, 9462773, 9462774, 9462775, 9462985, 9462986, 9462776, 9462777] into sparse-5849216-L49000000370851848

Change-Id: I431ccf0ecfe011daf6e385651e4c108e3574aa6e