Merge "replaced com.att reference in Generic resource API"