Merge "Change the MAX_SEARCH_TIME_SEC to 300 secs." into pi-dev