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

* commit '233e8ae7624019592d1d090ceed4a39fee07b80a':
  N is API 24

Change-Id: I3e74a44f57263a942b650dd3a1d6c874a5e0ad26