Merge "[DCAEGEN2-SERVICES] Fixing Policy Side Car Sync issue"