Merge cherrypicks of ['ag/20545970'] into sc-platform-release. Change-Id: I5bfa1e9bcb1518e0c752bfdba802b390def4d2f1