Merge "fixing non-telephony device test failures" into froyo