fix merge conflict in vendor/cm

Change-Id: Ibdeb99959c1c7d253671563c07481a8987b79794