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

* commit '4957b79ef6a75e56faa6a53ec66ebcb33b38f54b':
  N is API 24

Change-Id: I47eebbb47efe884539858f1e6ba0e55fb2464080