Merge cherrypicks of [6434025, 6434026, 6434027, 6434028, 6434029, 6432779, 6432780, 6432865, 6432866] into sparse-5261899-L85700000267799629

Change-Id: I131ee7845e6b85d4bef94e197de9230c3c8552ae