Fixing correlator api support objects

Change-Id: I0d88b5e677888e4da792f70d353cb3e4d6625678
Merge "Fixing correlator api support objects"