Merge cherrypicks of [18797388, 18797389, 19221742, 19267009, 19293650] into sparse-8804634-L70100000955510537.

Change-Id: I73a5c644783fe4db841a0c0678a649fd9f844f1d