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