Merge "DO NOT MERGE Make the Phone options dialog use current language" into honeycomb