am 99fd4344: am 96a8bb63: Merge "Fix crash caused by null owner info Fixes bug 7249550" into jb-mr1-dev

* commit '99fd43447d3092722eb508f829f3bc2e87367947':
  Fix crash caused by null owner info Fixes bug 7249550