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