Merge cherrypicks of [16381902] into sparse-7977198-L50100000952243188.

Change-Id: I579faf36466eb985a0c2787705877ab282bc14d5