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

Change-Id: I10c492c5512b79b6a127d9dd3cae8ccf380001fb