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

Change-Id: I3251f761ce6e9d786be14b8e19b5ab47f8094c0f