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

Change-Id: I57a8388f6b57fdb9d12850092e6a7b8e03b41822