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

* commit '4957b79ef6a75e56faa6a53ec66ebcb33b38f54b':
  N is API 24

Change-Id: I5d89f4b3adb5392641e7023e097f389b0a728ca7