Merge "Use context.getSystemService(.class) instead" into tm-qpr-dev