Merge cherrypicks of [1232633, 1232634, 1232635, 1232636] into sparse-6140868-L41500000459044442

Change-Id: I469dad1af12be28aca509d95c7e274955207dbd7