Merge \"Final N API.\" into nyc-dev
am: 75f62571b3

Change-Id: I3f9fe11b1db1d890adbaa65f8605eb9d600b0eb8