Merge "Return error for wrong mb_type" into mnc-dev am: e1ac7e3c6c am: 70d01da791
am: a9a9369c66

* commit 'a9a9369c6604d74a062af136ca60b8d295d68ae3':
  Return error for wrong mb_type