Merge branch 'SDKv2.8.5' into mindspeed_drops