Wifi Country code

Change-Id: Ic57d5f86e63e0fadd69d98c282a1e81360d5c6ae
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0