am a5010414: Merge "Fix native registration."

* commit 'a501041468dd5e4f84a13ac6f7e4aa5ebfb8dbff':
  Fix native registration.