Merge "Add in constant for WPA supplication settings" into jb-dev