Merge "Prevent sign extension in UsimPhoneBookManager"