Merge cherrypicks of ['ag/20614047', 'ag/20069004', 'ag/20834832', 'ag/20857269', 'ag/20874088', 'ag/20857271'] into sc-v2-platform-release.

Change-Id: I6754c328c13ef6139149433d26ba2a7bc31446e8