Merge "New function signature for setResolverConfiguration" am: 8052930f am: 12318b5b am: 2cc6819e am: 87337e0f Change-Id: Ibc309ee68b99712f74048cb5d865f7699c58edc0