Merge cherrypicks of [20535007] into sparse-9315182-L21500000957455638.

Change-Id: If1a355d30265306f26ebce79a305761e9f0e3457