Merge "Remove the last of the ResolvUtil uses" am: e7f1dc6661 am: befac97371
am: b0104bb32e

Change-Id: I819de385ad55c13f9d342c54480308ff081e1012