Merge cherrypicks of [19221742, 19267009, 19292868, 19292869, 19293650] into sparse-8804960-L95800000955507109.

Change-Id: I1a925ef34ef5721150e2097d07d5f6538468b4a2