Merge cherrypicks of [18797389, 19221742, 19267009, 19292868, 19293650] into sparse-8804744-L12000000955514047.

Change-Id: I537263454f75883203a2490cae75e0acbc303e12