am e9dd491d: Reconcile with jb-mr2-release - do not merge

* commit 'e9dd491d2295204fa5d4c1ea62e2cc80b80b1a59':
  Fix NPE