Merge cherrypicks of [16931243] into sparse-8174020-L12500000953111670. Change-Id: I337476fb06e190f410c535afc77d0143a6330bd0