Merge cherrypicks of ['ag/20545896'] into rvc-platform-release. Change-Id: I9bdfa11b62a7200d9a5b005da083cc9cda7dc682