Merge cherrypicks of [16656344] into sc-d2-release.

Change-Id: Ic530f9b9d8d25adc37117eedc475f2aee625f820