Merge "Merge "Load IA resolver settings from resolver package" into oc-dev am: 7f654b27" into oc-dev-plus-aosp