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

* commit '96fefaa23bf95ae6736df90f018cb8c86cb943c3':
  Track nio API change.