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

* commit 'f031b9e00f1307c34b14f8fb699f103d03181eac':
  Change VmProviderSettingsUtil methods to static.