Merge cherrypicks of [19771870, 19771871] into sparse-8909939-L64200000956179601. Change-Id: I1724136ef46547c53ab98c75900bbb4743d8e1ca