update to match cm changes

Change-Id: I883cc76c5869fc92cc103ba7b9f9edff9a2f3aeb