N MR1 is API 25
am: 2f9dcc4c92

Change-Id: I189edb4f2561a2f53d22b3186586c7b4896658fc