Merge cherrypicks of [18349843, 18603924] into sparse-8563200-L88600000954787219. Change-Id: I79317c66009261ccd6abd31d1c83cb6f1d932ab5