more up to date CM things

Change-Id: I29a3d76a6e6b9b53a0d4e91f41e00c5844859861