Raise timeout when method tracing is enabled.
am: cb497cf426

Change-Id: If98c9f8ffeddc57ee768a9e9ee066348cb5083dc