Merge cherrypicks of [16736788, 16736789] into sc-d2-release.

Change-Id: I6ce0019e60d4b218bc66d9682fc00cc75df1bea2