Raise timeout when method tracing is enabled. am: cb497cf426 am: 1f4128148d
am: 0ddf1a08cb

Change-Id: I2ce390aef0ed093d0f74442ee933198936f43325