Merge branch 'vendor_drops' into wifi

Merge the 3.15.rc1 from vendor_drops. This is the baseline which is
supposed to have the same behavior as the current build.

Change-Id: I16aed2d983b46ab8df4e9f8f09c4e5bf2b11831d