Merge branch 'SDKv3.1-rc4' into mindspeed_drops

Change-Id: Ib668414afb2e6fefa2a243f61a5fd02812717364