Importing helpers fixed for Clusters.

Change-Id: I4989a80fe2693d0afe8ca410747621cd17865aff