am 20495d2a: Merge "Fix crash bug with mismatched iface names" into jb-mr2-dev

* commit '20495d2a9fddfe712e04bde6a056f9fb058876d5':
  Fix crash bug with mismatched iface names