am 605ca505: am c4c58b24: Merge "Fix native crash" into jb-mr1-dev

* commit '605ca505f43f4e21f6caed855d0c761b8bc2f6d1':
  Fix native crash