am ed3fba65: Merge "Avoid null mobile interfaces." into jb-mr1.1-dev

* commit 'ed3fba653864101d3dd335941f082104aad8f532':
  Avoid null mobile interfaces.