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

Change-Id: I843e1f4b894f06736fe5288f0e12c79a10455519