Merge cherrypicks of [16737147, 16298079] into sc-v2-release.

Change-Id: Ibfee9b09eda7084e403fac64008668770b6b4922