Merge cherrypicks of [17129063, 17118783, 17397180, 17628095] into sc-d2-release.

Change-Id: I69f89268e00d6db3c337d992d09b74e3b16c54d0