Merge cherrypicks of [1162147, 1162148, 1162149, 1162150, 1161853] into sparse-5935223-L94700000387356965

Change-Id: I8a128c50876467fe33522438ed6dbf0f6d8a2435