am e0550b02: Merge "fixing non-telephony device test failures" into froyo

* commit 'e0550b02f42dfa086e9515ee0ab9909aefd68473':
  fixing non-telephony device test failures