track CM device/common

Change-Id: Ica48d8a5b420fd3ff9fba7afd5a690f9845b7984