Merge "N MR1 is API 25" into nyc-mr1-dev