Merge "Late binding: supplied Provider should be used"