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

Change-Id: Iad63e51a0168dc75e2d700fe42132e54563f4df5