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

* commit '70d01da7913e9e8ab1d5264637262495d50759f8':
  Return error for wrong mb_type