CM extractored

Change-Id: I53646904ccbe24e9adaf5a67b52a3ac36ff8108f