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

Change-Id: I9cfbdd0ec27cd20f2d65ef0520e691ed20082913