Merge "API 25 is frozen, so we can't change API." into nyc-mr1-dev