am c1abed5b: Merge "Tell the resolver what protocols to use." into ics-factoryrom am: bc75548c32 am: f42ef7ec79

Original change: undetermined

Change-Id: I411ec7eba6494ed3325ebaee33469912528a70b5