fix cm derps

Change-Id: Ic6a057955354952216e095c3178bc371837108a1