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

Change-Id: I9c9394ef98529bbf645717edf1c88a44397c41fc