Merge "Use SettingsLib's versions of Custom* classes." into oc-dr1-dev