Merge "Change the parameter type from ContentResolver to Context" into sc-dev