Added CM changes

Change-Id: I882dd17d6fb10ec83983fdfca58abaa9f5b7d80f