Merge branch 'mindspeed_drops' into master

Change-Id: Iace5a5c61f7b46f709904691be44fdda4a132b0b