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

Change-Id: I4510210a6fb1c9c1aed6bebea5cc478dae25f3ee