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

* commit '3b875f3f533e1db220a030afc437fcbc5f82dafe':
  N is API 24

Change-Id: I7c1fe5fc9abb1576c9c48dcee3c2cc94ad117b00