Merge \"N MR1 is API 25\" into nyc-mr1-dev
am: c9099d1a84

Change-Id: I959b38c391e0ab5fa00c2389c85c2a1aa07dcf61