Merge pull request #535 from dcd/cm-12.0

jf: change wifi to US region