Add support for cm-10.1

Change-Id: I791f4921b1a5b53bf5e781979e0232c4a46ec7fa