Merge "Fix crash bug with mismatched iface names" into jb-mr2-dev