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

Change-Id: I90e23f6a248a9c890d894bdd04c884cc216af111