Merge SDK 3.1-rc4 into mindspeed_drops

Change-Id: I64bb7d453f4a67f353f2f75274122612ad1b9b2e