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