wp-1.0.0/CAROLINE-18/2

CAROLINE-18: remove build cycled dependencies.
(cherry picked from commit ec91becc0a0c1790581b514cb02dedd95bcb464d)