Merge \"temporarily disable FakeSettingsProviderTest\" into nyc-mr1-dev
am: 2b0b1e5a94

Change-Id: Ic3152624c192074838dd7ebee82d4d4a2bf74533