am 2f4cc8ea: Merge "Fix a crash case" into jb-mr2-dev

* commit '2f4cc8eacfe819a4f54aa4b0318ad1d31ecc2a40':
  Fix a crash case