Merge cherrypicks of ['ag/20612020'] into rvc-platform-release.

Change-Id: I89beebdd15c5e9022549a4beb3b198de0bd904e5