Merge "New function signature for setResolverConfiguration" am: 8052930f4f am: 12318b5b4e am: 2cc6819ebf
am: 87337e0fa8

Change-Id: Ibc309ee68b99712f74048cb5d865f7699c58edc0