Merge "Fix a FATAL ClassCastException in DataConnection.java" into froyo