Merge cherrypicks of [18797387, 18797388, 18797389, 19221742, 19293650] into sparse-8804251-L39000000955492386.

Change-Id: I820aa1eff65f35ab3ca64ce5884de37aed15c295