Merge cherrypicks of [2222123] into sparse-9088035-L94000000956489903.

Change-Id: I18b8441e5adf76a8812eea9264a88f6b88c52795