Merge cherrypicks of [1163208, 1162727, 1163209, 1163210, 1163363, 1163364, 1163365] into sparse-5991721-L37600000387765813

Change-Id: I307cb5c7ea64a8e12c251f1600ad08d5114cd283