Add compatibility with CM

Change-Id: Iaa3db856a1bfc05db4c51797264f254ab7204943