Merge "Extend test timeout value from 180s to 600s"