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

* commit 'e1ac7e3c6ccc407cc213e66f053781c666159519':
  Return error for wrong mb_type