Revert "Fix CM branch"

This reverts commit 62469e58adcba09e8cd5897db11b0eca80e580a7.

Change-Id: I7499ac9e67d7d2b77ae9633bef3e20d15c7449b2