Cleanup CM Merge conflicts

Change-Id: Ic43c3ba53edb6f1fbb7c0b738871f9cbd611ffb3