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

Change-Id: I1f3c3ee2e37911f30253d7cbbbeb799aa6a9bedd