Tracking CM device/common

Change-Id: I6b79b5b9caef0241d885103ed862f6a1e1a5beba