Merge "Remove deprecated BindingAwareProvider methods"