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

Change-Id: I88fb622d6a937f75fe27f5d3efa826f7e17faff3