Merge "Remove forced module sync from NCMP integration tests"