Merge "Check if the trace was stopped before starting the tracing thread" into rvc-dev am: 164a1d8b1e am: 35c9d2f04c

Change-Id: I66a328c68204b6cb06deac1932886a4752784f99