Merge "Remove vvm dependence on AccountManager, save values in shared prefs." into mnc-dev