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

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