Merge cherrypicks of [16381902] into sparse-7957957-L88300000952193189.

Change-Id: Ie13b763e71904c4adf78d8724c64f3627697398e