am 1cbabd4d: am 9354302c: am e0550b02: Merge "fixing non-telephony device test failures" into froyo

* commit '1cbabd4d6d5251fdbad9f0d690caa12ed274063a':
  fixing non-telephony device test failures