am b87e6138: am 618ed234: Merge "Track nio API change."

* commit 'b87e6138d169e5fd23b964056431e2c357323fd2':
  Track nio API change.