am f9bac006: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit 'f9bac006':
  Remove blank translation string from en-GB, so it can show English.
  Manually enter translations for msgid: 9014073093293520112
  Fix layout with no access points
  Added info about why Wi-Fi is required
  Show warnings when skipping Wi-Fi connection
  Fix regression in Bluetooth settings.
  Addressing issue where power control widget disappears issue 7205586
  Fix NPE in DeviceInfoSettings
  Fix a crash in InstalledAppDetails
  Tweaking mechanism for adding keyguard widgets
  Fix issue #7178865: Selecting an app from Settings > Apps>...
  Must initialize the new atomic..
  Fix crash in Settings > Security
  Wifi settings are in a different namespace now
  Update Settings app to use new namespace for airplane-mode settings