Merge "New function signature for setResolverConfiguration" am: 8052930f4f
am: 12318b5b4e

Change-Id: I12d721a809646070900f81723a4d10f4635fec15