Merge "Context.getSystemService() shouldn't return null..." into rvc-dev