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