Update CM Changes

Change-Id: I4e24c13f117f76d04f4d8a919288e13e90d115a1