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

* commit '94264d522efcc21ac749a6444fbea90916f575c9':
  Fix a crash case