Merge cherrypicks of [16816308, 16630867] into sc-v2-release.

Change-Id: I5817aa8c870e5e8f2849644bdd966813d55960e3