Bug 1336509: cfgm_common is imported as common

Change-Id: Ib3f9acfc341fd34dd31950c2353d0e62ded58ea3
Merge "Bug 1336509: cfgm_common is imported as common"