Merge remote-tracking branch 'cm/cm-11.0' into HEAD
tsubasa: Fix typo in SD Fix

I know this is an old issue so I looked at it and saw a typo
Probably this might be it to fix it

Change-Id: I1c602dc222757a0e7c76b77e07bfc04f103b7c9e
Merge "tsubasa: Fix typo in SD Fix" into L5