Merge "fix test for non-telephony devices" into froyo