am 1edaacd1: am 8151adab: am 1f71d722: Merge "Remove vvm dependence on AccountManager, save values in shared prefs." into mnc-dev

* commit '1edaacd1f246cf957aa80e9b7550d35d0ef2b7b1':
  Remove vvm dependence on AccountManager, save values in shared prefs.