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

* commit '5b0007fbf268a8d1ad65db996acf7b0141dfe19d':
  N is API 24

Change-Id: I3ced3af7e88582632ca6bb9804690372edcf2616