Clean-up after cm-dependencies messed it up

Change-Id: Iba574ed2fffe8918daef7ed528e3735399247698