Merge cherrypicks of ['ag/20613775'] into sc-v2-platform-release. Change-Id: I9ea4f7a1dc5aadfe390a6dcb627194a34eb04161