Merge "ActivityCompat should use static methods, not be publicly instantiable" into nyc-mr1-dev