Merge "Add BlockedNumberProvider to core.mk"