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

Change-Id: I1a2efbabc765dd1ff66316332cd69b221deff83b