am 9009c8ab: am f031b9e0: Merge "Change VmProviderSettingsUtil methods to static." into lmp-mr1-dev

* commit '9009c8ab4ecc525e51995536b60fa3f7952f82f6':
  Change VmProviderSettingsUtil methods to static.