am b0e5326d: (-s ours) am a46a5cba: Merge "DO NOT MERGE No backup of country...
am b0e5326d: (-s ours) am a46a5cba: Merge "DO NOT MERGE No backup of country and sleep policy" into honeycomb
* commit 'b0e5326d':
DO NOT MERGE No backup of country and sleep policy