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

* commit '9c0ce7b2c8c787e486c8ec20ce1e38de5f38cb65':
  Change VmProviderSettingsUtil methods to static.