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

Change-Id: Ieff128e440a34124e96853c700930f3f9b8f5b5d