Merge "N is API 24" into nyc-dev am: 4957b79ef6 am: 5b0007fbf2
am: bdde00191b

* commit 'bdde00191bdd4f17591cc643a87a274531fd0073':
  N is API 24

Change-Id: I548e712cda8f7a0818a9ba19f6e47b9338e48a0a