Merge "Fix build - fix import of SettingsRobolectricTestRunner." into oc-dr1-dev