Merge cherrypicks of [16853284, 16850708] into sc-v2-release.

Change-Id: Iac8e7b1ad89349b2d3a78030a6cc5dfeb6317b35