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

* commit 'f211cae2ede701b58228ff0090bb894f17c0557f':
  N is API 24

Change-Id: Id4970239ff53cf27c7d3aa547da383d3f80d2ec9