fix barrier

Change-Id: I93d44b228abdbfb37671268644e2f86b417f3660
add cm.dependencies

Change-Id: I540e492a729c00e0b660ccc807bca1f3701f9a8f