Merge "Added MasterSystemService.onServiceRemoved() and some other nit fixes..."