Merge "Updated harmony build values to OTA values" into froyo