Merge cherrypicks of ['ag/20614047', 'ag/20069005', 'ag/20834832', 'ag/20857269', 'ag/20874088', 'ag/20857271'] into rvc-platform-release.

Change-Id: I8ae06d4953078f7b28fbc2f0b55c9ea859e67f27