Fix CM not TG

Change-Id: I465ac45ac275145fd3083a8f79c3a13fe8eefce3