am 4bb18810: Merge "Huawei fix for receive message tests failing on Mobile Internet Devices, Personal Media Players and other non-phone devices" into froyo

* commit '4bb188100dd8252cb54bcf2edb20171b63e13334':
  Huawei fix for receive message tests failing on Mobile Internet Devices, Personal Media Players and other non-phone devices