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

Change-Id: I5c6be9cacc687e1f453f3d596ee977dad243101e