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

Original change: undetermined

Change-Id: I059d66b286a93fbcac7deee5622de356139fb3db