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

* commit 'c4c58b249e02c944f05107398f1d32e3c41e28d1':
  Fix native crash