Fresh CM extractored

Change-Id: Ib36f0b5c85e041b18babc16c685e0fde2702a2b8
Freshly cm extractored

Change-Id: I7382cfb3f0bae34cc33b8d08f34b491245cabf94