Merge "Cherrypick 'Change the MAX_SEARCH_TIME_SEC to 300 secs.'" am: 608cd4f173
am: 56cb7b61ca  -s ours

Change-Id: I91503e9276f20cbcd0d264f15f619b6d3dbe43c8