Update dcvs from caf

Change-Id: Id30265dc8d0289d6face8b454721b87c21159653