Merge "Cherrypick 'Change the MAX_SEARCH_TIME_SEC to 300 secs.'"
am: 608cd4f173

Change-Id: I9540e9a52a8e2bde98a403e61db8be253793e09c