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

Change-Id: Iaa664a5f66b43ca59ea886b249e5a06b95d56e12