am e451414d: Merge "Fix NPE" into jb-ub-mail-ur9

* commit 'e451414d75c8baec6aed0326a82632f2886c32e6':
  Fix NPE