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

* commit '618ed2340283263164f578f818cc09148aacb9ed':
  Track nio API change.