Merge "Change the parameter type from ContentResolver to Context"