CM updates

Change-Id: I056846d87e2f72ea7b046a21cd62226e4c390c6f