Merge "N is API 24" into nyc-dev am: f211cae2ed
am: 4ea89b7e6c

* commit '4ea89b7e6c72a8e2c7feb14a5988ed0ccbe7600a':
  N is API 24

Change-Id: If64938bf40a631c809e522960de9f6eab49e04b6