modify for CM

Change-Id: I236d146f4ce992746d77f24ddfa80bfc8db7854e