Merge "Fix SettingsDrawerActivityTest on fugu." into oc-dev