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

Change-Id: Ib53f7760a2571b136b2e2c28c92670d51ac8ced2