Merge "Fix FeatureUser leak in ConnectivityService" into honeycomb-LTE