Merge "Fix ISO country code of Slovenia." into honeycomb-mr2