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

Change-Id: I565f9937715330e3b83a1e5b12467e8deef64121