am a46a5cba: Merge "DO NOT MERGE No backup of country and sleep policy" into honeycomb

* commit 'a46a5cba276ee269d227a5e4d69f3891c4349edf':
  DO NOT MERGE No backup of country and sleep policy