revert back to cm

Change-Id: I534b05da578f84fd91b0fbef9baa4d9d19bb2f8b