Merge "temporarily disable FakeSettingsProviderTest" into nyc-mr1-dev