Merge "Don't cache null in getSystemService()"