Merge cherrypicks of [16730784] into sc-v2-release.

Change-Id: I55aea6fa65ff68210634113f8ad895fd8781e078